more RVM disabling by default

Andrew Cantino 11 年 前
コミット
922622eae4
共有1 個のファイルを変更した3 個の追加4 個の削除を含む
  1. 3 4
      config/deploy.rb

+ 3 - 4
config/deploy.rb

@@ -4,8 +4,8 @@ set :application, "huginn"
4 4
 set :deploy_to, "/home/you/app"
5 5
 set :user, "you"
6 6
 set :use_sudo, false
7
-set :rails_env, "production" #added for delayed job
8 7
 set :scm, :git
8
+set :rails_env, 'production'
9 9
 set :repository, "git@github.com:you/huginn-private.git"
10 10
 set :branch, "master"
11 11
 set :deploy_via, :remote_cache
@@ -18,12 +18,9 @@ server "yourdomain.com", :app, :delayed_job, :web, :db, :primary => true
18 18
 
19 19
 set :delayed_job_server_role, :delayed_job
20 20
 
21
-set :rails_env, 'production'
22 21
 set :sync_backups, 3
23 22
 
24 23
 before 'deploy:restart', 'deploy:migrate'
25
-before 'deploy', 'rvm:install_rvm'
26
-before 'deploy', 'rvm:install_ruby'
27 24
 after 'deploy', 'deploy:cleanup'
28 25
 
29 26
 set :bundle_without, [:development, :test]
@@ -40,6 +37,8 @@ after "deploy:restart", "delayed_job:restart"
40 37
 # If you want to use rvm on the server:
41 38
 # set :rvm_ruby_string, '1.9.3-p286@huginn'
42 39
 # set :rvm_type, :user
40
+# before 'deploy', 'rvm:install_rvm'
41
+# before 'deploy', 'rvm:install_ruby'
43 42
 # require "rvm/capistrano"
44 43
 
45 44
 # Load Capistrano additions